Add missing hooks for callbacks. #1142
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mikereiche
commented
May 28, 2021
| @@ -172,7 +178,7 @@ public void setEntityCallbacks(EntityCallbacks entityCallbacks) { | |||
| this.entityCallbacks = entityCallbacks; | |||
| } | |||
|
|
|||
| void maybeEmitEvent(CouchbaseMappingEvent<?> event) { | |||
| public void maybeEmitEvent(CouchbaseMappingEvent<?> event) { | |||
| if (canPublishEvent()) { | |||
There was a problem hiding this comment.
need to call from ReactiveRemoveByIdOperationSupport
| @@ -95,16 +96,21 @@ public CouchbaseDocument encodeEntity(final Object entityToEncode) { | |||
| } | |||
|
|
|||
| @Override | |||
| public Object applyUpdatedCas(final Object entity, final long cas) { | |||
| public Object applyUpdatedCas(final Object entity, CouchbaseDocument converted, final long cas) { | |||
There was a problem hiding this comment.
Added converted CouchbaseDocument to args as AfterSaveEvent takes a CouchbaseDocument.
| */ | ||
| T onAfterConvert(T entity, Document document, String collection); | ||
| T onAfterConvert(T entity, CouchbaseDocument document, String collection); |
There was a problem hiding this comment.
This was copied incorrectly from Mongo with the second arg of Document instead of CouchbaseDocument.
| @@ -33,17 +35,19 @@ | |||
| * @author Mark Paluch | |||
| * @author Michael Reiche | |||
| */ | |||
| public class AuditingEventListener implements ApplicationListener<BeforeConvertEvent<Object>> { | |||
| public class AuditingEventListener implements ApplicationListener<CouchbaseMappingEvent<Object>> { | |||
There was a problem hiding this comment.
Support any CouchbaseMappingEvent. Not just BeforeConvertEvent.
| */ | ||
| @Override | ||
| public Publisher<Object> onAfterConvert(Object entity, CouchbaseDocument document, String collection) { | ||
| LOG.debug("onAfterConvert " + document.toString()); |
There was a problem hiding this comment.
should remove this debug.
mikereiche
force-pushed
the
datacouch_1074_aftersave_event_etc
branch
3 times, most recently
from
2aba7f2 to
615f873
Compare
mikereiche
force-pushed
the
datacouch_1074_aftersave_event_etc
branch
from
615f873 to
ed3d923
Compare
1) the previous change (#955) to CouchbaseAuditingRegister intended to register AuditingEntityCallback instead of AuditingEventListener but only changed the name that AuditingEventListener was registered with. Since AuditingEventListener does exactly the same thing as AuditingEntityCallback, it behaved as those AuditingEntityCallback was being used. 2) It seems that the two mechanisms - EntityCallback and EventListener both do more-or-less the same thing. I'm not sure why there are two mechanisms to do the same thing. 3) Although the ReactiveAuditingEntityCallback mechanism is triggered only for reactive operations and the non-reactive AuditingEntityCallback is triggered only for non-reactive operations, the events are triggered for both. Since there was a desire to have distinct callbacks for reactive/non-reactive operations, I also made distinct events for reactive/non-reactive operations. However both the reactive and non-reactive event mechanisms are triggered for either reactive and non-reactive operations, so it is necessary for the mechanism to determine if it should act on the event. 4) Although there is an AbstractCouchbaseEventListener that is extended by LoggingEventListener and ValidatingEventListener, AuditingEventListener does not extend it (maybe it should). Closes #1074.
mikereiche
force-pushed
the
datacouch_1074_aftersave_event_etc
branch
from
ed3d923 to
b311c6f
Compare
mikereiche
added a commit
that referenced
this pull request
Aug 9, 2021
1) the previous change (#955) to CouchbaseAuditingRegister intended to register AuditingEntityCallback instead of AuditingEventListener but only changed the name that AuditingEventListener was registered with. Since AuditingEventListener does exactly the same thing as AuditingEntityCallback, it behaved as those AuditingEntityCallback was being used. 2) It seems that the two mechanisms - EntityCallback and EventListener both do more-or-less the same thing. I'm not sure why there are two mechanisms to do the same thing. 3) Although the ReactiveAuditingEntityCallback mechanism is triggered only for reactive operations and the non-reactive AuditingEntityCallback is triggered only for non-reactive operations, the events are triggered for both. Since there was a desire to have distinct callbacks for reactive/non-reactive operations, I also made distinct events for reactive/non-reactive operations. However both the reactive and non-reactive event mechanisms are triggered for either reactive and non-reactive operations, so it is necessary for the mechanism to determine if it should act on the event. 4) Although there is an AbstractCouchbaseEventListener that is extended by LoggingEventListener and ValidatingEventListener, AuditingEventListener does not extend it (maybe it should). Closes #1074. Co-authored-by: mikereiche <michael.reiche@couchbase.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
the previous change (Add @EnableReactiveCouchbaseAuditing [DATACOUCH-644] #955) to CouchbaseAuditingRegister intended to register
AuditingEntityCallback instead of AuditingEventListener but only changed the
name that AuditingEventListener was registered with. Since
AuditingEventListener does exactly the same thing as AuditingEntityCallback,
it behaved as those AuditingEntityCallback was being used.
It seems that the two mechanisms - EntityCallback and EventListener
both do more-or-less the same thing. I'm not sure why there are two
mechanisms to do the same thing.
Although the ReactiveAuditingEntityCallback mechanism is triggered
only for reactive operations and the non-reactive AuditingEntityCallback
is triggered only for non-reactive operations, the events are triggered
for both. Since there was a desire to have distinct callbacks for
reactive/non-reactive operations, I also made distinct events for
reactive/non-reactive operations. However both the reactive and non-reactive
event mechanisms are triggered for either reactive and non-reactive operations,
so it is necessary for the mechanism to determine if it should act on the
event.
Although there is an AbstractCouchbaseEventListener that is extended by
LoggingEventListener and ValidatingEventListener, AuditingEventListener does
not extend it (maybe it should).
Closes #1074.